Another build fix attempt after r165141.