Attempt 2 at fixing broken build