Revert many-many changes to fix display with older ION