Deal with an annoying difference between 4.0.1 and 5.2.