remove once we actually start remapping patches