Revert "Some fixes from Seb, because it baisically didn't work"
Revert "Some fixes from Seb, because it baisically didn't work"

This reverts commit 04ae79249895cb7c319c71888417a3c0ffae4962.

kugick/FarmLife