Merge "Fix build by removing old file."