(I don't remember why this was in a seperate event handler, but we don't need it to be anymore.) References #85