Fixes #6315 by moving around a few pieces now in place to account for removing all tags