Delete an obsolete build file.
Revert an unnecessary diff from upstream.