Pulled in some removed edits