Do we need to worry about back-compat here (from removing a parameter)? Would anyone else be calling this or is it (hopefully) largely just internal?