Fixup for 3793077
Fixup for 628450d