Fix regression. It seems to me that this code still works only by accident
though. Needs serious cleanup.
2 files changed