address review comments for bug 869003. landed bug 869981