Revert afc1f6b..9e9aaf3

This rolls back to commit afc1f6b9468d2489f771e56e6a8eeb618e8e3605.
Revert to original master for branching