MT#3997 Remove QueryParameter dependency.