Merge "If we ever rescan a stub, make sure to uncompress it" into sc-dev