remove ubuntu block backported as @gws suggestion