Moved function out of class to avoid having to patch higher level interface - refs BT#6759