Revert 8d1c42296fefc4e79189b6c2d78a8a78fdd9576d