Attempt to fix regression when drawing User primitives.