Revert e0cdde7ff7b0e867225049550b3efbf9fe10f5b1 manually