Reworked patches
Should finally fix charger

Change-Id: I4243dd41e7fa3958b6e715cf0eb86b779056f9b5