Revert "Fix "Dereference of null pointer" compiler warning."

This reverts commit 5bfdce99499ef19f7b74471b8b143c4c04d2d947.

Change-Id: I653a233f32ec80022bb8a6f1418e9b74f46ca131
1 file changed