Restoring quantity field for real
Merged changes from adding quantity field back