This will have to be merged with #4765 at some point, and whatever approach is taken here should be consistent with the rest of the file.

/ping @m-schuetz