Revert 3d125e9..79cd11d

This rolls back to commit 3d125e92107c17e84abd4ac0dee871ee9cb8bd06.