Revert some changes to glib20, since it breaks many other g* ports