NONPRODUCTION rollback rehearsal

old-target-b86efc38