SP-1476 - Revise the list of shims we ship