Revert "fix npe with somehow-null intent"

This reverts commit 73c69a3e296345790de49e1596ecbceef4abfdf0.