Revert "Quantity step1"

This reverts commit 7ef111455e93cf75fd2207d818e7e52e55577679.