removed duplicate from upstreaming and merging back

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>