Took into account feedback from review request (BZ#866265).