Merge "Revert "Improve immune spaces logic"" am: a48224f327
am: 690f8b2542

* commit '690f8b2542b2d2a4e6eda8ae74b767d3db630c38':
  Revert "Improve immune spaces logic"