Damn, that's no longer relevant either.
Merge bug25979 (again)