I understand if a fix isn't ready but I would prefer if features were not removed when moving from 25.1 to 25.2