This is an intermediate step that would help with #2610 and #3183
This is an intermediate step that would help with #2610 and #3183