Revert 7044e55..bd06dcf

This rolls back to commit 7044e553f1a656a3af4bba76aca4571967d705fe.
Adding merge