Revert ccbdca7..fb27ff6

This rolls back to commit ccbdca7aa26a8626bb3975d14b269d9153bb55b2.