Revert 8947499..3598082

This rolls back to commit 89474990be39ca6534b797c50fdee8925a46a3e3.
LifeCycleEvents_4