reverting FLEX-34101 as this cause several spark list test to fails and one to RTE