This reverts commit 748f35ccb8.
Fixes #114995.
This will be redone for 4.7 / possibly 4.6.1 with a more involved solution.
This reverts commit 748f35ccb8.
Fixes #114995.
This will be redone for 4.7 / possibly 4.6.1 with a more involved solution.