Revert "2014-5-13"

This reverts commit 8553d858ba2da9ba29f564403d341112f9e087e8.