This is needed to solve bug 139990.
Assuming that per bug 117356 comment 14 this became moot, so closing WONTFIX.