This doesn't fail in 5.5 anymore