r9590: forget to remove this from the 3.0 tree