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