Revert "almost working?"

This reverts commit a15af93be0519466bb8ee856acac1a2c3be022cc.
unbreaking things