See #734. At some point the old option should be removed. We'll want to give users some time for this one.