Revert constant generation + Quality of service change
4 files changed