Ok, the last commit was a bad move (see 15fde25).