FIX: Revert UIC change