Non-thread builds are used by us for dhcp package. Make it working again. Related to [GL #4424] and [GL #4459].