Merge branch 'revert'