Revert "2014-06-03"

This reverts commit af013be5f3c02aa81d774810048bd63078554680.