Remove deprecated flag from 3.01a-integration.  981 supercedes ths, and the merges were all bad.