Revert "In maintenance"

This reverts commit 42c484bf608bed429d8abc6948a5140e9221d3dc.
New Quotas 2013 (Big refactor)