Unreviewed, speculative build fix for High Sierra after r248925