Unreviewed, fix build after r188860