Follow-up r85020 per CR - use strict comparison