Fix potential cause of build timeouts.