This should still be configurable with a deprecation note