Revert d98015e..a1169a4

This rolls back to commit d98015e2ce7c87244b1170fb16a247083f893a56.