This allows one to decide which behavior is desired (future new behavior
or old one) and get rid of the warning at the same time.