this should be part of a different patch and a different bug. BTW nothing has been agreed yet with UX