This reverts commit ebc4a4c9.

This is in line with the clang-format specs, otherwise we will loose the
2 empty lines around classes, etc...