Revert changes from Frankinstine in order to fix battery life