Move change from master that gets rid of MetaScanner calls