glib2: revert too much substitution...