Revert ba134e3..f25efb7

This rolls back to commit ba134e3b361a9143d3f997ef26150f4bc34d7bc4.