remove (hopefully) last 5.4-ism