Revert to working system/core.

Stop changes for now...