Revert svn 297681 as it has been deprecated by svn 297575.
Submitted by: Tomoaki AOKI <junchoon@dec.dakura.ne.jp>