Fix [17577]. Removing 200 lines of code is nice. Replacing them with lines that does the same thing as before is better.