Rolled back rippledistance modifications