Revert 229bae1..97d552d

This rolls back to commit 229bae1548deee51c94067223bd68adcb1ab4f2c.