Issue #3832: backport 677a9326b4d4 to 2.7 (and delete some obsolete code).
1 file changed