Revert "crap, I fucked something up working on it"

This reverts commit 9b914018319603e87e31ce35282491d9653a38c3.