Revert 6294d919f163a12536b21b9e42c074a48c17176d