Don't do generic-3.16.x twice