Revert "2014/10/27 Toshikawa"

This reverts commit bde5dbc565cabf40dc485c4c077575c5c7587f6c.