Revert "Merge branch 'server_set_to_idle' into 1.12"

This reverts commit 487a2c55f22bbd486f2a6c7430a645f818f7094b, reversing
changes made to f6d38a75c6e8da8c3288b0860cdae49e9764af52.