Removed patch now that helper_call_modifier has been fixed