Fix #299: Cherry-pick @iluvredwall implementation of stacks evening