Re #9933. Fixing the mac build