Revert 7b9aad0..7712aaf

This rolls back to commit 7b9aad0b3f709258c398fd21460ae0b3d3f765cf.