In !26884 (merged), the changes broke the UFO building in JETM8, and this MR provides a fix for this.