CB-5209: Dirty, Dirty Fix for Building.  This works, but needs to be prettier.