Switched to generic layout. Build should pass now