d9896f3bb56 was detrimental to iwd/how, so make it more finegrained