Fix regression of #10038 introduced by #13772
Merge pull request #13800 from hnrch02/fix-umd-regression

Fix regression of #10038 introduced by #13772