Cleaned up experimental fix, and mark slave as offline rather than disconnect it, to prevent a build from hijacking it.