Don't we need to put a deprecation warning as well here ?