Merge trunk's 43068, deleting re.py. This leaves the branch in a broken

state (unless you happen to have a re.pyc lying around), but it'll be fixed
in the next merge.