Revert "fix possible NPE"

This reverts commit d0586d28969b2146a19d09acb7b3c545d6a17c05.
Revert "Fix appwidgets not updating"

This reverts commit ab7e7e605ad505b7acc00e213364a46ad6f9e7ea.