Removed unsuccessful fix for #1982.

Will be fixed in Simperium instead.