Add back generic patch