commented, no functional changes; from Christos Zoulas