Revert "haggy.. to make it compile"

This reverts commit 48fc331eb79ea8c3d518c39a102c9c0e3f47f561.