I jumped the gun with that patch a bit. Here's an updated version