PR #26007 used these to avoid causing a mass rebuild. Now that we know things work, we do that to clean up.