Revert 0b0d2c2..85bb2d6

This rolls back to commit 0b0d2c2df2f21adf3c5e14e6cae250c031a7308a.