Reverting

This reverts commit bd55353a37835cf107a3ab5e3c33e67afba3ab97, reversing
changes made to 2d3c404dbb3991d3aef2c028e3c143160ef919a0.