Revert "Extreme UCing"

This reverts commit 81b950619dfe542053e29ea39b391206d552cba8.