I don't think this will be happening in 2.1. The patch is a few weeks away.