Revert bf24349..4e7dba2

This rolls back to commit bf24349b72a6edb583c64072cf9ec71bcbc651d7.