Revert bed148e..82727ff

This rolls back to commit bed148ee69d1b518a9805d1a0e3cbbcbee56a80e.