Revert "meh, it has it's problems"

This reverts commit 42ead66e6c7ee6f66fb0995262bb2e2ac2528881.