Revert "2014-04-07"

This reverts commit 9086cf2a4e8a2fdb7a28dc8ad5f08003fc272a0a.
Revert "Update for 2014-04-07"

This reverts commit c44d0d1f06b51a1b11cd80ae54e7b3b2d0f2ce5b.