This reverts commit 4512ad2d. This was never applied to master/9.6 originally. (cherry picked from commit a44bdc27)