Revert "Some more potential divergence fixes" This reverts commit 6bb8b6a5826e96ee137db86b4c1b15f6954766c9.