get rid of incorrect code reintroduced in 4.7