work around non-working uhs mode

(cherry picked from commit 3dec5836da77d0ec4041711486c0c3a4ee75b8e7)