Revert "Fix CPU UV"

This reverts commit dbe94e3bce5008f9b2113e4573de84a6002d2f04.