bad refactor
Revert "bad refactor"

This reverts commit 24610297361a9a4892b7d8fdb18bc00dec2f9994.