# This is reverted shortly after landing
4432a2d14d80081d062f7939a950d65ea3a16eed

# These were manually backported
21be5c8edd3ad156f6cbfbceb96e7939716d9f2c
4b392ced2d744fccffe95490ff57e6b41033c266
b6905438514ae4de0b7f85c861e3d811ddaadda9
