This revert has merged upstream in change
7f65d43b0465eb27c638e44395e5ca535574c2a1