Revert fd31c03..53c7149

This rolls back to commit fd31c031b7da0e830dfab8a331a69a3a16c4dc84.