Temporary fix for ULib and #185. This will be rolled back when we get a more permanent solution.