Don't manually queue media templates - 3.9 now handles this properly.