Reverting commits in wrong branch/repo. Sorry!

This reverts commit 4aaf80323da9b89576ec1f826260ea2fe2f75375.
Reverting commits in wrong repo/branch. Sorry!

This reverts commit 74693cecb74330989a0dd8b6030392b37d6e3ba9.