Cherry-pick minor regression fix in Mono.