[SP-1218]: Only build new shims