Remove dependency on support (fix)