I would like to see this fixed before we merge this.

@Mailaender: what is the trouble with moving that into WidgetUtils and using it in RA?