Do we now have a listener that can do this in the bundle? If not, should we perhaps re-add it and link to it from here?