Revert dac7dbdc8941f839e7ba9c2ffba983be6cd1c6c5