Revert 317750e..9f37255

This rolls back to commit 317750eea4a2e5e18f3f2c97068c69d425161eed.