Use the same support library we have on WHI