Revert "20140706"

This reverts commit 4aa1fd75b001d417194f04a2dda3cbfaa2f7749a.