Pre server tear-down commit. Will it ever live again?