CONN-168 build problem attempt #2