Work around build issue

Why is this change being made?

There's an investigation in progress (internal link) to determine the cause of some build timeouts.

This work-around seems to do the job for us. I'm not sure why but, until we find-out, it's better than not having advisory updates.