Workaround latest boot snapshot issue