Previous commit should have a better workaround for #3211. This reverts commit b61ea62732.
b61ea62732