Revert 6927068..526780d

This rolls back to commit 6927068e7785ca34ea8afee5275533993dfa50aa.