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