Mostly revert the changes I made with commit d27c8205.

I completely misunderstood the main concept behind put slave on hold. With the exception
of corner-case that can only be solved at the application level, putting slaves on hold
should work correctly once this partial revert is commited.

(cherry picked from commit 5c65f468)