Speculatively revert r8644[3-5], they seem to be leading to infinite loops in