Revert 'Format' related commits in order to release this package.

- Will move the work to a dedicated branch.