Regarding the change that came with 9cbed89b
Should it be split out, or incorporated in one function?