Bug 1064496 review changes