Merge "Revert "Remove offline slaves""