Revert to commit 92772fbd...