And big oopsie right there... Some extraenous changes that I had
reverted long ago found their way into the patch by means of magic.