Undo the proposed fix for 1475 for now, because it will break existing tests.