Fix a regression from revision 7787f5139c1b.

TODO: Squash.