Merge "Remove long-obsolete file."