Fix small typos.
Remove workaround since the problem is fixed upstream.