instead of doing one the manual way and not fixing the other. PR: 185905 Submitted by: Yasuhiro KIMURA <yasu@utahime.org>