This reverts commit 1743aff91e.
We revert because it breaks the engine to framework roll. Reverting as
soon as possible allows other engine commits to roll into framework
first so we'll have smaller engine rolls which is good for triaging
regressions.
TBR: rmacnak-google