This reverts commit f9e3ca54. The commit results in internal test failures. Test case provided offline.