Revert "extra/boost fixes"

This reverts commit e8ed09bffbcf503339f16cb3f0bb57cb14da6f75.