4.3 Removed overriding of core files