[NTVDM]: Temporarily fix for r65015 before a proper fix.