Commit 1ab6e78b23a8cc063c29e67a1d69f487baa1f0dc makes this unnecessary. Bug: 27637680 This reverts commit 10cafe2a.