BZ-0000: Revert changes
Revert "BZ-0000: Revert changes"

This reverts commit 1d03e3ac4b39b6fa55f41bd87a8aeef1ffd1df13.
Merge branch 'EBPbranch' of https://github.com/NoesisEnergy/bootstrap into EBPbranch