Re-added WKT definition support