Remerged from upstream.

Hopefully this will fix the issue and only include the new post.