Homing failed error even though it succeeded

ryall

I've changed the homing scripts to work with my IR sensor, and everything is working fine. However, every time I run it I get a "Homing failed" error in the web panel and I have no idea why. Does anything look wrong in my homing files? X and Y are as default, using latest firmware (2.0RC6).

homeall.g

; Probe leveling
G28 XY ; Home X, Y
G28 Z ; Home Z
G1 Z10 ; Move Z to 10mm

homez.g

G29 S2 ; Disable the bed height map
G91 ; Switch to relative positioning
G1 Z5 F6000 S2 ; Move Z up 5mm
G1 X25 Y50 ; Move to 25, 50 so the sensor is over the bed (probe at 25, 25)
G30 S-1 ; Probe the bed and stop when triggered
G90 ; Switch to absolute positioning
G92 Z3.1 ; Set Z to 3.1mm (distance of sensor)
G1 X0 Y0 Z0 ; Move to 0, 0, 0
G29 S1 ; Reload the height map from file

dc42

G30 S-1 just stops the probing move when the prove is triggered and reports the height, but it doesn't set the Z position. Use plain G30, without the S-1.