Remobe these files that were removed upstream.  The commit to remove
them was too large for me to cherry pick.