Revert aa1fd8f..f3437ee

This rolls back to commit aa1fd8f6664f982e948be793bdc943359da1f541.