This reverts commit 6a164ab306dad9096bde736c907494c71086d3c4. The function was awkward and we now have only one caller again, so we can fold it back into it.
This reverts commit 6a164ab306dad9096bde736c907494c71086d3c4. The function was awkward and we now have only one caller again, so we can fold it back into it.