Proper fix for #49

Having to revert some of
81e38c198aa0a11609ca9c42194331921fae128d#diff-0b4d7d038175ea0aeb1e55b36797dacf
- you cannot just comment out a section without looking at the
consequences!