We of course shouldn't make it depend on WP 3.6, but we should see what's already done and backport what makes sense, instead of starting from scratch.