Hopefully the final last-minute fix before -rc1