This requires some code shuffling. I've created a ticket in our tracker and will take care of it later this week.
