Revert ef26b34..01ccda1

This rolls back to commit ef26b34fbf2d2a0ce1c1501d85d3aad723fda99c.