De-abstract this, a lot of things don't use it.