bug 996810 - review changes per wlach's request