revert outdated changes to master