Reverting 9efd748a7c3e8efe48ce14c4e1c82f485a506de1 as it causes more problems than it solves. Other boost installations also fix the observed problem this change was intended to fix, and that solution is preferred.