Fix sinfo to work correctly with draining/mixed nodes. (copied sview code)
This also reverts commit 8cff3b08032cd3d692dfbf1eb6ba1d1f4e92be25 and
ced2fa3fa3ade7bc1a2d11578cc924da73f18d42