Revert be4de74..cf83e76

This rolls back to commit be4de7495b3e0b7717956461dd232b9e6f2fff62.
LifeCycleEvents_3