This reverts commit 0ffe86a1. This was intended to land for the 2.75.x unstable series, and not in the 2.74.x stable series. Fixes: #2788