Address issue discussed at 1674c1d.