Revert the spectator stuff for now (#27)