I don't know how to do otherwise.
But i looked in all files and i didn't see any call with $return set to true, so maybe can we remove this argument (and so remove this specific code)