PR#1901 didn't break things!