Thoughts on adding a deprecation warning here so that we don't need to maintain this conditional forever?