Revert commit e045f616dac9097276a4f09505181bad7f437374