Got it.
OK, let's do the changes from bug 919004 here.