The changes in PR 15811 have now been included in no less than six official releases, hence it should hopefully be OK to remove this now.
The changes in PR 15811 have now been included in no less than six official releases, hence it should hopefully be OK to remove this now.