Revert UVL optimizations