Unreviewed, build fix after r240805