Uops, correct patches
Removed useless one, readded needed one

Change-Id: I3b603944e313d2bdc13dddb64ec8520ef86e4640