Bug 21683: (follow-up) Polish the change - based on feedback