Revert ac1f925..5ddbe69

This rolls back to commit ac1f925f18aa08631646984f66bb406db12fcd67.