Back out UIDShift patch, which wasn't correct anyway and shouldn't be merged