Undo 6e2dd76881 (Improve stability)
It seems counterproductive