Revert c122cc2..f094551

This rolls back to commit c122cc26479833e3616fc1d91b55e2a41afee390.