Revert 1b682d7c801c138851d344a9d462ae61a66e8ef4

It doesn't fix the problem and introduces a new one.