Darkstrap reinstated with line 442 commented out.