Revert: Add appropriate component scans that were missing (fc76268)