server: Erm... *actually* fix stacking

I should probably test this before I push things, now that people are
watching.