Scares me that we're starting to do this in more areas. I wonder if it would make sense to do this in component utils? Anyway, probably fine to land with it in.