Merge branch 'revert-ef866fdb' into 'master'