Replace the interim lli build fix with something cleaner