I don't like leaving this delete commented out. I recall it was causing a crash, but we should figure out the cause and fix it properly.