Whoops. Looks like I forgot to update the patch before sending. This one
should be better.