remove errant import
Merge branch 'master' into new-detail-toolbar