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