removed stupid history-destroying code