Fixup for 48f0f9b2
Fixup for ea635480
Fixup for 856357fb