Revert "patch here to remove workaround in activity manager"

This reverts commit 8f1cfb29f6e74a3c2e8bd14380e5a5c12caa5e34.