Finishing a merge from master

Removing a commented out block.