This reverts commit 5bfad44ef4 because we'll need another RC on latest 4.11 branch towards 4.11.3.0.
5bfad44ef4