Revert the previous patch since it causes lots of miscompilations. :( :(