reverted 8224f44ad6b2f763343560b6bb3242cfdbff3ee2, refs #809