Revert 22bc95b..a2ecb42

This rolls back to commit 22bc95b12c910bf5fbdb0e9053e95b65398bb2bc.