Revert "Some more potential divergence fixes" This reverts commit b385bd9ec97777b9e22e5101daed190723c9fd88.