Remove Code from 2.10 that breaks 2.11+