Remove static primitives hack.