Trying to fix builds with older boost

Change-Id: Ic270319ef9b7bcee33e6c443072308a3c63bc3af