Abandoning Core-collapse

For now...