Revert d386c78..331ee45

This rolls back to commit d386c78967c9b99fb6abd3488d065e596d1d6fa9.