Reverting to old changeset and adding in power management files