Merge branch 'jc/revert-merge'