Decouple applying patches from staging the source