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

This reverts commit ce6f2cb74f78196e8d80a8b9acf27060e5fa09eb, reversing
changes made to 1fd8ff155afed452acac530a99b267c31030a842.