This reverts commit 0b3d573e. Unfortunately, we need more than just that. Change-Id: I42ac79cb396812b91cec67ba681144592c0e2e01