What is this doing?  I'm waterskiing through this change at high speed and it's not obvious what's going on here.  It should either be called out in the docs or in the ticket as part of the bug.