Fix 3.0 erroneous merge
Revert "Fix 3.0 erroneous merge"

This reverts commit a44e82b76f38917a535d3537da798bc6b268ce3a.