Reverting back from boost future support