Removed repeated code dragged from a manual merge