Revert 5423861..b4a1b31

This rolls back to commit 542386157b572bc07f3de577884f04e1a8d47194.