1b3d8a0dc8
This reverts commita14bb81af7. The patch apparently is included in src since762e22d063(from PR #200846)