Revert ed4fc96..bc31b4c

This rolls back to commit ed4fc96ddc86f521d5ba32f3824c28dc35f9ac90.