This solved one problem, but introduced another. Revert the functional
change while keeping the rearrangement of code to make future changes
easier.