One last portability fix attempt for r195886