This reverts commit a14bb81af7. The patch apparently is included in src since 762e22d063 (from PR #200846)
a14bb81af7
762e22d063