e53f982
Revert "Revert annotation updates" We now have a new gobject-introspection build, so drop the last patch.