I'll push an equivalent edit to 2dbdbd3 here, feel free to revert all these if necessary...