ModelAdmin's get_fieldset and get_form interaction changed starting from 1.6, old way being deprecated in 1.7
Turns out the increased query count was a bug in that specific Django build that got fixed since.