This reverts commit d6e58d02a619813a4187ab53ab0ffc2f0b864ad7. Erik seems to have commit this by accident. Let's discuss this first (see patch #9555)