Revert "this sucks"

This reverts commit 4c87ab2e9bb9c77b1706cbbca14ceac9bdf77bdc.