This fix didn't make it into bug26000, since it was branched from stable and this module is new in default.