Fixes #4048 - Remove duplicate lines from wrong merge

Fixes #4048 - Remove duplicate lines from wrong merge

See http://www.rudder-project.org/redmine/issues/4048