Fix build problem that showed up in system tests.