Bug 22818: (follow-up) Respond to feedback