Thanks, I pushed the attached patch, which also mentions a downgrade.