Oops, restore old entities_clear