Revert until we figure out the stackless index panic