Probably better to not do the not_compliant_on but just keep a tag for now. We'll move to only support 2.x in the future soon anyway.