Actually, I think I need to let @kaberett handle this since it touches on bug 4751.  Leaving it as is for now.