We should also backport this to glib-2-56.
glib-2-56
Closes #1465 (closed)
This will create a new commit in order to revert the existing changes.
