[TIDOC-1363] Readd removed items and marked them as removed
Merge pull request #4956 from bhatfield/tidoc-1363

Reviewed and merged.