Revert "Avoid NPE under stress conditions"

This reverts commit 6798f1578a4646222aaac126bfd3292d1a0bb268.

Reason for revert: 127996235
Fixes: 127996235
Change-Id: I51b2afa558fe71cb64e12e37e36132f3e0190c5d
1 file changed