We should get rid of this code at some point before we release 3.0