Fix for r100905: