Revert files to match upstream