Revert "Real last UC2 fix"

This reverts commit 8ab3a2b7ddc1f33385742e54ef3bb6fcc07d22aa.