landed part1 for bug 843004. more work for part2