References #2563: Backed out TopologyTransformer changes.