Opps filename change snuck in late night, revert that. Document changes and remove old comments to avoid confusion.