fix
Revert "Revert "Remove ishield for 92 compat""

This reverts commit f5d1108c4a4ef4b3d55eaee5f73e9917112aaaeb.
92 fix
92 fix