refs #6856 still reverting API2