Revert "<original commit message>"

This reverts commit 1d0fe70499c625da4928bd89f2af1fcb07e302ca.