Revert b68b8ec..cdf9ba8

This rolls back to commit b68b8ecb6827fc9930da86263368c53db324046e.