This is now passing. Uncomment and close out PR6281.