Merge "Removed obsolete "containsOldMagic" code"