Revert to commit 2f341238fa83edc7979e44fb10bd22e5eed1667f.