Fixes merge conflict issue incorrectly fixed during a fwd-merge in 825935 from PR #1766 Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>