GUVNOR-2122: Fix merge issue.