Revert "Bug562295 - temp fix for NPE"

This reverts commit df8b43f26759cbfc9f031a2eec94b2db74b4b659.

Change-Id: Id6659c70e26cabf9bee0cb83a391b1b1a5ef63a7
2 files changed