Manually revert d34418100be19fdbdf112febde3303edd48c9247