Revert commit d40b0592e9abc3a3122ea145237ca26178b57166