refs #6856 still undoing wrong merge with new API ticket