Revert f2bce20..ef2b1ff

This rolls back to commit f2bce207caa2005f139908a6f6656e13055f6945.