[Core] Lesson learned: Steal less code