Revert "Let's try a different approach"

This reverts commit cc7295e78f324d814f52a3bb59ad9c821639a4ea.
again again again