Follow up to git #92b0f95