Revert cd75a38..a5a8716

This rolls back to commit cd75a38856917f6d67dd534a5fddad5d3baa1355.