OZP-193: dont shim on show always