Revert "<original commit message>"

This reverts commit 7834c2e8b6619896fb0a2479c99baed79498cb34.