This way, we can test both layouts in parallel and, in case something goes wrong, we always have to old layout as a fallback. https://bugzilla.gnome.org/show_bug.cgi?id=766922