I want to eventually group these, but since we don't have a proper grouped delegate for these this makes it at least work again.
