Merge "Revert "fortify: allow diagnostics without run-time checks""