Revert "Revert "2014-07-02""

This reverts commit d948bc4b883683ffdc07aa0c7c8ff3448d0f5f6a.