Bug 1025195 - Reset quota to the min extra

[merge]