Merge "Revert "Greylist methods with varargs and intrinsics"" into pi-dev