Power Monitor revert

Reverts Power Monitor changes; temporary till they can be fixed.
Merge pull request #188 from Askarn/master

Power Monitor revert