No logic/code changes yet, just extraction/separation. Fixes #12105 Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>