This reverts commit 618acf5b12.
618acf5b12
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae