Revert c7f07b3aaf5921647bd66a6ceb8f9741900bf4b2

It doesn't fix the bug.