Partially revert change as UInt is only for flash