Remove patches from commit

Change-Id: I7565336b9c6e331cb36f988568732ceb21338cdb