More server-side rework.