Compat. changes to make it work correctly in SS2.4