Removed code that got inadvertantly included while doing manual merge for dlnasrc-36-cpp-comments