I feel like James Kirk or something. #932 is finally fixed.
The patch is completely crazy, but it seems to work.
Will be applied hopefully very soon, if QA approves. :)