Revert b7075ed..8c8978d

This rolls back to commit b7075edf108c6ae0f7467bdbec01d740fb91d0be.