revert previous commit as 2.x was not affected in fact