A preliminary patch for big cleanups happening soon. https://bugzilla.gnome.org/show_bug.cgi?id=690539