Revert ba31829..ebb80e9

This rolls back to commit ba318293291ac452159b22db5e577c7af12435d3.