Revert "Refactoring to fix the activity leakage on rotation"

This reverts commit 875d87bb8a10c8611f32c3e2fa2985f0fd483b31.