Remove piece of code which was accidentally included in recent commit
Merge branch '2.4.x'