Reverts commit 6e3a9fe41171344f682a5b8e40961e987ce7458f