Perhaps we should consider dropping s2.1 support.