Merge branch 'revert-10744d91' into 'master'