Revert "Revert "20140724""

This reverts commit 79d186b670b133be315e38775bbc2c9ac4de3b59.