Fixing broken build for last check-in