Revert "20140715"

This reverts commit 30fc677d5eed392994b1459d9d0f4aedb8b60d3c.