Comment 47 for bug 1330037

I extracted Tim's powerd patch and created an upstream MP for this.