Revert "kill this for now"

This reverts commit de06966e4903ffbcb479ed16dd2abf641edf7368.