Revert changes trying to fix baseband wakelock issue