Revert "x"

This reverts commit f727cb220ede4bb8bb763d761080c16afb278b2e.
Revert "Revert "Real last UC2 fix""

This reverts commit 93ac1ae78422d1450dfd961512cf3536b655964b.