Replace with upstream version (Formatting)