Revert 3ab358b..4511806

This rolls back to commit 3ab358b07fc6403b8735215ec619fed5af19f9e1.