(Broken) Revert commented lines (fixes line 119)
(Broken) Fix lines 238 and 259