Revert commit abc4ec2e7763e8b07a98dc2dec5c81f784b3adcf