Really postpone deprecation window