Merge "sed -i run as root wasn't preserving ownership."