This reverts commit b82de02e7c. It is causing crashes in various regression tests. Ref D14763
b82de02e7c