[2.3] Remove this please