Revert "2014-07-04"

This reverts commit 01017e34673d557bd25213f478cfd1f10d6e7f5a.