(FR #823) bt does not need special forms for AVS

Change-Id: I4c8714fe0024855651851a1e37be4a8209505e73