Interim work on etag issue.