External Core: re-add code I removed mistakenly in last commit