this may not be good for the tests, please check what @kmfk did on the qpush bundle today, it is on the commits fresh