r24947: Forgot to merge this to release branch, so we got weird subs in