Manually pull in commit 689dd9ce6bf5a4659325aeb7d9c265468202822f which
I missed in my "ours" merge (commit c5a0c148f7e067a8d57c839c594d0de0e77772c2