r706: Fix erroneous commit... I've not finished testing the