Revert "JBTM-1901"

This reverts commit 73daf5af12e35800b841123344edf4867588e6c8.
JBTM-1904 Update to build blacktie subsystem