Get rid of rev1 support