Revert "Hacky fix for activator lifecycle and child routers"

This reverts commit daf07120c0e371677fb8ca712702aa7631db0d80.