Bug 1093600: Backout Bug 1088253 for breaking comment adding