Unreviewed, another attempt to fix GTK build after r94038.