Future patches will tweak and reuse the function in different places so
move it separately first.