I missed this before I merged, but can you either remove this line or uncomment it?  Same with the one on line 40