Revert "Little fix for stages"

This reverts commit 979aa4cd373f6447cd7372d71c81ae0130fecc3f.
Revert "Beware of the trees"

This reverts commit 254fa2996ccb8cb6003a95a57151205304ce3ed3.
Reverts