Changes to core files reverted