Fixup of previous commit de5278e5. "I should have done as Katsumi