Revert "patch for monitor disabling"

This reverts commit 447959ff5155fbd802714a81367fd41a47b7f62a.
Revert "cleanup broken solaris support"

This reverts commit 48ead51bf8175937f90e74afa11efe2557b215ee.