refs #1654: revert local-only changes