Fixup for 72c46bb6
Fixup for da08d276