Revert "Merge branch 'branches/rudder/2.5'"

This reverts commit 107c8a65bf0ec2ec9f0bbc6d9cadd0373237c0de, reversing
changes made to de47b1153a9dc5865ec077cd41c099126a9ea7cc.