These are extracted verbatim from !1571 so that we can merge them now instead of them hanging around unused for any longer.
See: !1571