Pullreq 4 - (cherrypicked) remove duplicate constant definition

(cherrypicked) remove duplicate constant definition