Revert accidentally-committed files in r220460.