Revert "Fix Power Collapse and Memory Leak"

This reverts commit 89f4207bf7910d70002fc921081706215727253a.