Revert debug hack stuff