Fix #8666 for sure this time.