Bug 1033549: Review follow up