remove double-contextualization
Merge branch '2.4'
... and undo the damage