Let's try this for now - Ref Omni Gerrit #10213