Resolve RT#91891