This reverts commit 65037a2d, reversing changes made to de8d861f. This change was causing a test to fail in ParaView so reverting it for now until it can be investigated fully.
mentioned in commit 1f459af9