It would be best if that were merged down into this, but a later fix-up
commit would be OK too.