Revert "Fix minor EBN issues"
This change fails to build on the CI system, which in turn blocks several Dependency Build jobs from completing successfully.
Failure of Dependency Build jobs makes the CI system maintainability extremely problematic.
This reverts commit 9d6729ea0dc4f3e935d16a0da41184df08c51c59.