Fixed as per Tim's comments on r61179: