Revert "Improve immune spaces logic"
am: deb880435f  -s ours

* commit 'deb880435f892f2f577a7c730bbccb315bc49e1c':
  Revert "Improve immune spaces logic"