Back to standard entire file overriding strategy