Revert ffa9431..d2c32c9

This rolls back to commit ffa943105c1c5ec560f9bc0fb1faae1b348c037d.