[gynvael]

This goes to the "fix me" list. We're planning a rebuild in the next few days anyway, so it should get fixed then.