Reinstate John's 2nd crawler fix

Now back to state at commit: 3894a838e97a036e9f17464181aabff0b38e1cbb