Rejigger-ify the insert tool order

Change-Id: I9e37561eaac17689378af2c6a14dbf24b9326e9e