This reverts commit af0e448859.
Unblock the release while I figure-out how the change broke things...
Bug: 19505341
Bug: 19507107
This reverts commit af0e448859.
Unblock the release while I figure-out how the change broke things...
Bug: 19505341
Bug: 19507107