See #4678 - we should investigate if we can behave better when the compute engine configuration changes from under us.