Revert aa2bf88..75a22ca

This rolls back to commit aa2bf887f09f131bf2ca752e05dbb1fd5b7782da.