Cherrypicking 9879ad47...