A Challenge!

I will bake (and send) brownies to the first person to solve (patches) the problem in Ticket #18561 in an awesome, non-hacky way that gets the thumbs up from the core team (leads+committers) and is committed to core, thus ending my teeth gnashing.