Revert commit 2999da0eaa02a70ef28aedb95993bd3b5f897638