Revert #602 from wallyworld

PR #602 breaks MachineSuite.TestDyingMachine as indicated in:
https://bugs.launchpad.net/juju-core/+bug/1361721
This PR was also reverted in master