Revert "Core API compatibility"