Revert hack for gdk-pixbuf and fix it correctly upstream