Re #6630. Trying to fix osx build error.