revised according to conversation with Eric Barton