Reverted Server, accidental regression