Bug 21626: (follow-up) Changes based on feedback