Last-minute chaos as Niall Blair pushes water reform through