Reverted not treating a quantity a dependency of itself to fix errors