Revert "Revert "2014/8/23""

This reverts commit a04817b61719b55acdad7201b16c53800dce2d91.