Bug2268: Deprecate legacy Payload classes