What about the other change? (Feel stupid now for bundling those two commits.)