reverting some changes to be replaced with other changes to solve boost issues