Reverted [75e4d5fbed] and updated to do integration work in our driver directly