Revert files to version in master to fix failing tests