Comment 20 for bug 1774268

On second thought, this works fine as-is; there's no need to over-complicate it. (My alternative thought of just setting the value when missing probably isn't ideal either...) so I've pushed this and condensed the two options to be a little bit tidier to rel_3_3 -> master.

Thanks everyone.