Reverted some CCSPI performance patches. This might slow down the Z1.