This reverts commit 9280078cf0 [formerly 0261bc7735663dba45681a5c0e4026b4c1fddeba]. Former-commit-id: e2850cd34a48bcccaa887a33ff7bf06e0a25c904
9280078cf0