Revert "Follow up to https://android-review.googlesource.com/114561"

This reverts commit 64d3f78ee5d9dabf7df6106241dfae3334b34714 per https://android-review.googlesource.com/114664

Change-Id: I2acab828d41e79847db72f8d2677c12173a323b6
1 file changed