This doesn't actually fix or change behaviour, but does seem like something we probably want to do here.
This reverts commit 10142a4471.
10142a4471