Actually staged the changes alleged in the last commit. Ticket 93.