Revert "AvosRest"

This reverts commit 872904dfb2a0eacbd406833e251368a82757cf82.
Revert "Revert "AvosRest""

This reverts commit 0d97e6fbfa2157c2da919ffa5dbb5b6a3d362654.