This reverts commit 4911b107dae26150ec87cc31cada0e52f97061d6.

The idea was to keep the stuff in the git history.