[SP-1219] Remove shims from 5.0.7 build