Revert to commit 25688e241e37eee079aee2fb9a53fb095733c2aa.