Revert 38022ac5. I agree that the file is cruft but there is no point to change upstream source for this purpose