Remove dependency on non-public package