Add yucky workaround to satisfy people on 5.3