Revert 2b0eb442da8097fd5e54450ded7710949a277dc3 and 8fc877d7cde0c981a7847175aed78c5763f2aab8.