remove workaround for issue 7702