Get tests passing on 8.4.