Prepare for move to GraniteOld [0]