[1524] Removal of compatibility feature