This reverts commit f7065ff2. We don't need it anymore because the new code doesn't have the issue at all