Update for bundle helpers change (#4527)

The new bundle helpers caused Gi to be imported when running GTK2
activities. They have been moved to a place where they are not imported
in that situation. Update the users appropriately.