This reverts commit 075f7997, reversing
changes made to a7add686.

This change was causing issues in ParaView and since ParaView is in its
release cycle, reverting it is easier than fixing it right now.

See !5345 for discussion.

Merge-request: !5096