2014/0924/1010
Revert "2014/0924/1010"

This reverts commit c83e2060ac82e3928d63ada6121f22f5c94b4fba.
Revert "Revert "2014/0924/1010""

This reverts commit e048eb05a5ec3b1370b1fd57e342cee527e4a0cf.