Revert "Extreme UCing"

This reverts commit a6c8aa637ffcb6007fd038d1643aac446d6e6f8b.