Revert "more ugliness"

This reverts commit c4d54f103a7b201ada7b81f6d51aa5df2a999594.
I hope it will work