Revert "doomsday to swamp fix"
This reverts merge request !805 (merged) Every MR in server-data had conflicts after merging this. Will be easier to add and resolve the conflicts of this one MR later.
This reverts merge request !805 (merged) Every MR in server-data had conflicts after merging this. Will be easier to add and resolve the conflicts of this one MR later.