This is going to go away, thanks to bug 415.