Fix change in behaviour accidentally introduced in r201754.