Revert "Merge branch 'bfitzpat-JBTIS-347'"

This reverts commit 0cc74556c45e963748e61f7872b15cdeb84ca5ed, reversing
changes made to e23dc7a07705f0dfca20386baaf6fc1c7cb81a13.