Tweak last change so things hopefully work again for all platforms.