Revert "Small structural change. Babysteps."

This reverts commit 87b22ce7881809c1fab951954b97482443aba7fc.