Re #1643: fixed Companion build (thanks Jenkins)