Re-add patch to remove autodeps...