Revert "Fix vendor calling from Muppets now"

This reverts commit fc413865fdcf25578a705bea8d86ee2250b9741d.

Change-Id: I8943ba6fac5c3fdc177ea079e3d1fe42ea3eab96