qs removal broke tests, restoring