Revert "use avp uuid"

This reverts commit b14970fd6c3669e7d120598633e0eff330d858c5.