Revert "null checks for Vendor functions"

This reverts commit f3e98440b9978a77f231224cbda81911b3975ee4.