Revert a57c664..59dcebe

This rolls back to commit a57c664b6350e186160493568a68e31deb6abbe7.