Merge "revert deprecated sim activation logic"