Convert to no longer output legacy values