Power Monitor revert

Reverts Power Monitor changes; temporary till they can be fixed.