Hand-deleted switched-around files that weren't properly removed during a recent commit.