revert incorrect change in #5617