Comment out change on "keeping compatibility" as to see effect on tests