commit bdb3f441 says that we may undo
the change in august 2014.

I think that it is time to do that.
Signed-off-by: Long Wang <w@laoqinren.net>