Revert b7ad7bb..2dbaee3

This rolls back to commit b7ad7bbea37dca55680de954f38d4a55ce9747a1.