Let's see if we can merge in the new changes...

<sigh>