This patch is a bit more useful.