Update 2014-05-12
Revert "Update 2014-05-12"

This reverts commit b8edf09d9a07e4b01cb78addb1b05f248dd6ed9a.