Reinstall the somewhat broken build components

We can live with the BCL warning for now.