rollback r16711