reverting 03a3f6cab226df879814df945ca6d440fd38a168, was bad, refs #842