Revert GL !8447

This reverts commit bd572bb5 (c0292576, 3aeac8e2, and 57d8e294), reversing changes made to 28c92c9b.

!8447 (merged) does not meet criteria for backporting to v9.16.

Mattermost thread:

https://mattermost.isc.org/isc/pl/eksihaupsjf3uxwm5kemtoamko

Closes #4355 (closed)