Revert "2014/8/23"

This reverts commit ebd330f5e3917bd95f314a5254b49c68d74a5e1d.