Remove code that was supposed to help for #9 but also causes issues.