r2781 - reverted changeset:2623, ticket:39 is reopened