Revert broken stuff to have the damn stuff compile