suggestions from maintainers re: bugzilla #704881