Prepare for move to GraniteOld