Revert "2014-09-22"

This reverts commit 850cf7ef69fd5f610d1472dd274ff75b5b9d80b9.
Revert "Revert "2014-09-22""

This reverts commit b513a9daadbfd650ba66716c8291e64a4675b283.