This reverts commit 1ea46ea8.

Don't use squash because in this way we will lost the history.