Attempt to fix breakage from r128782 reported by Francois Pichet on