Revert "Changes to fix NPEs when bundle changes."

This reverts commit a1ae0c74a58b3d89c425f1350bb09f4320067cb4.