refs #6560 Updated files

This reverts commit 3e580f13a63d92280dbc5b4e8c21c26df4a9715b.

It is a revert of a revert, so identical to the first push.