[rhel6-branch] My take on bug #1120640