Re-add patch to fix build