Revert "Attempt to backport 83abc3a97f to erp5-vifib branch."

It seems this hack is no longer needed for the moment.

This reverts commit e5852bed34ff65f77bd53ca6a1f9a80747d21f7b.