doh. cherry-picked: ea3e129