7143711: Feature added by 7053556 should not override what's set by the constructor in secure mode

Reviewed-by: hawtin
3 files changed