cherry-pick 3890 removed
It doesn't seem to be needed, and has been abandoned on gerrit as well.