Migrated to the data path solution -- what a hack.