Took out 4.6 specific stuff