Actually fix the history-eating bug