Detail:
- Choose the solution that was already in place (before last fix)
  for 6.0
- minor cleanup in comments