Revert "remove duplicate added in last build fix"

This reverts commit 0c8a372522950abb1b3515e62d15d7120732684b.
Revert "fix build"

This reverts commit 827e8ae49d488ab33b4f2cf4687f45597fbf4a81.