Fix up after 493d4d70d9968dc828bcbf29a2a8c9f042634827