undo Bug 2096065 from this branch