Malte, This sounds good. We want to make sure that when we change existing behavior that some users are not relying on that behavior, even if we think it might not be ideal. Allowing optional fall back to the original behavior is a good idea in this situation.