patches: rework

Change-Id: Id33b1578198cbad29857ec49f4e8fe31df18b7b4