Revert "Generic unspecific bugfix"

This reverts commit bdf5a4db818a95482e53b2c57e731f1b2ecfe88d.