Revert "Prevent an NPE"

This reverts commit a776c98e21dd04dabffcb80ae1293aae505e09dd.

Change-Id: I053eb768abf440eb4ea51c32a664287fa0fb1e9e
1 file changed