commented out some lines to make it work with tastypie trunk