Re-apply r135319 with a fix for the constant island pass.