Revert "Something weird"

This reverts commit b409a632c1aec30c1fce19454a44ace434eacca7.
final version