Revert c014241..90c7b37

This rolls back to commit c01424178d43d17470432a93df800a1be00df1a2.