Cherrypick report speedup

Cherrypick of #222 to master because Dashboard 1.2.23 has some reports of slow node deletion likely due to change 04b4c0fe280c9388eea6bb36564ec109f906d0a1