Postpone deprecation window