Is this still required? We don't use it anymore in the function and I guess it's only there to not break anything. Perhaps we should issue a deprecation warning then.