Revert "20140724"

This reverts commit 0a7c03f965152cbd05e20a4060208d553d79ab08.