For ENG-5694, fix order of evaluation that causes short circuit to noop necessary calls