CSR-134: final changes to abandoned spike.