Fixed as per Tim's comments on r60665: