Revert "Temporary patch to avoid crashes."

This reverts commit 165e51a7a9067485e7b54b14b571020d7d9bdfc5.

Bug: 21873627
Change-Id: I3245a7e9cede9d2e571ae2f994c0defd4172e3e6
1 file changed