Revert dde9e47..83010c0

This rolls back to commit dde9e47e11ecc32ce73ddaa5388024f01dbf060a.