VAPI: updated as per the last r_bin imports change.