Revert "DO NOT MERGE Content Detector Tweaks"

This reverts commit 9e0d54c11efc3e6ea9dfb4d7733d355450031336.
2 files changed