Revert "Merge branch 'bug_7688' into 3.12-master"