Revert "redports backport"