Revert 28a2675..e3eda8a

This rolls back to commit 28a2675fac6c090870f56eec26d0e0472b634e11.
To be rolled back