Revert commit 82d7733768a6a48116ff55f1b9806a36d2f686ee