Delay tool selection to preserve default
0.5.3