Falling back to old key to prevent issues