Comment 1 for bug 966785

Yup, it's pretty ugly against canonistack right now, it was better before the upgrade changed a bunch of things. Most parts will be trivial to fix, where I've been unsure is which bits are specific to canonistack configuration quirks.