SP-1476 - Revise list of shims we build