Revert "Merge branch 'orbharbor' of https://github.com/jhorback/Harbor into orbharbor"

This reverts commit dedeac7883af8ddd28fa416006b2a3ddcd2c15c6, reversing
changes made to f4ae6cf40a1bf0137ffc9bb874e9dfd6720ac144.