Added back GTK3.12 specific changes