Revert 6029b8d..ad75afb

This rolls back to commit 6029b8d24ff20c7ec2cb30540c9f5fe8679e4b86.