Revert commit 572c7f1987fb238697fb018b81ff35fa04afd7b7

I think commit 572c7f1987fb238697fb018b81ff35fa04afd7b7 is not necessary now.