Revert commits until 8ff8a2d30a30aad99f2e74329955a69b135edcac.