Revert "this is so not gonna work"

This reverts commit 26d41a750dff8ac226298e971d6547621877be55.