This reverts commit cc0b9647. The commit is causing a failure in internal testing. Will recommit with a fix later.