Bug 838461 - Review comments.