Temporary workaround for #1842.