Fix #610 for real this time.