Reverted to pub's core_elements