Allow @dkubb to work faster [ci:skip]