Revert "work around non-working uhs mode"

This reverts commit 870a2b83518cea23d9afa1778c95d76ef03cf207.