Revert 3db175b..3c7f1ee

This rolls back to commit 3db175bcd6529b51e8ef7d525584557066d53512.