Eliminate backcompat for pre-0.6.5