Revert to commit b024df00a648ccb319588c23a3cf77bf94b0a1b2