Revert For Fix Build

 "Fix duplicated variable"

This reverts commit 3ca986fc640017c104265adb32a29d70da04c702.
Merge remote-tracking branch 'upstream/jb3' into jb3