Revert "hacking away"

This reverts commit 8d295520f52bf0ee01d5b20b2166770494d653e1.