Bug 825056: WIP (see notebook)