Agreed. This class is public and can be used outside or RWD so this change doesn't hurt still?