Add back in vendor stuff for Tilapia