[RE2] Took into account the feedback from the review request (http://bugzilla.redhat.com/show_bug.cgi?id=868578).