Revert "Merging again."

This reverts commit f097d8e7211a37cd9e183db0f941915b6114ac3c, reversing
changes made to 25c932493748e99594d58e67a2619621938173dc.