Revert 44 part1 edits