The expired header is now a implementation detail for the TM driven
deferrals. Fixes #887