reverting e6ed538132 : the problem had found a more global solution previously