Reapply r185872 now that the address sanitizer has been changed to support this.