bbradner / discovery-holdover