Adjust for debbugs:18384 being fixed now